Tweak include order a bit to get around compilation errors

wintab.h defines an INT() macro that interfers with some lines in
commctrl.h.

diff --git a/gdk/win32/gdkdevicemanager-win32.c b/gdk/win32/gdkdevicemanager-win32.c
index 1af90395f685422acff9b6d94c3640078c870857..19ae866f765f9922cd8506a66943b997f1885685 100644 (file)
--- a/gdk/win32/gdkdevicemanager-win32.c
+++ b/gdk/win32/gdkdevicemanager-win32.c
@@ -24,17 +24,14 @@
 #include <math.h>
 
 #include <gdk/gdk.h>
+#include "gdkwin32.h"
 #include "gdkprivate-win32.h"
 #include "gdkdevicemanager-win32.h"
 #include "gdkdeviceprivate.h"
 #include "gdkdevice-win32.h"
 #include "gdkdevice-wintab.h"
-#include "gdkwin32.h"
 #include "gdkdisplayprivate.h"
 
-#include <windows.h>
-#include <wintab.h>
-
 #define WINTAB32_DLL "Wintab32.dll"
 
 #define PACKETDATA (PK_CONTEXT | PK_CURSOR | PK_BUTTONS | PK_X | PK_Y  | PK_NORMAL_PRESSURE | PK_ORIENTATION)

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index eaacd01e80b52c0f4d991aa4aa3f51c4030b1099..cc7343c7f62b60ec46d3b8d5a54fcb8b1e389cf5 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -48,11 +48,11 @@
 #include "gdk.h"
 #include "gdkdisplayprivate.h"
 #include "gdkprivate-win32.h"
+#include "gdkwin32.h"
 #include "gdkkeysyms.h"
 #include "gdkdevicemanager-win32.h"
 #include "gdkdeviceprivate.h"
 #include "gdkdevice-wintab.h"
-#include "gdkwin32.h"
 #include "gdkwin32dnd.h"
 #include "gdkdndprivate.h"